Merge branch 'master' of github.com:SiriDB/siridb-server into uvfs
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 23 Mar 2018 14:23:00 +0000 (15:23 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 23 Mar 2018 14:23:00 +0000 (15:23 +0100)

Trivial merge